Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 4 Jul 2011 07:45:17 +0000 (00:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 4 Jul 2011 07:45:17 +0000 (00:45 -0700)

Trivial merge